iconset: Remove stray references

diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index ea7da0a3034348f2e0c2641fe86fe40adc4b5cbe..f08416caf6f163cbabd01ed216d37f1201e7c520 100644 (file)
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -233,7 +233,6 @@ static gchar *types[] =
   "GtkActionEntry ",
   "GtkRadioActionEntry ",
   "GtkIconFactory ",
-  "GtkIconSet ",
   "GtkTextBuffer ",
   "GtkStatusbar ",
   "GtkTextIter ",

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 395bec22cdcf2fbf98dcd6bd82fe4ff5797bfcb5..adb40321fa181da541fa45b5935dfc6d508e88fa 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1689,7 +1689,6 @@ GTK_IMAGE_GET_CLASS
 <SUBSECTION Private>
 GtkImagePrivate
 gtk_image_get_type
-GtkImageIconSetData
 GtkImagePixbufData
 GtkImageAnimationData
 GtkImageIconNameData

diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c
index 72d03007f7f507235b74cea27b7ac02afaeb82cd..dc398c82b8bd9ab184aba95609ac3b7088731a3e 100644 (file)
--- a/gtk/a11y/gtkimageaccessible.c
+++ b/gtk/a11y/gtkimageaccessible.c
@@ -279,7 +279,6 @@ gtk_image_accessible_get_image_size (AtkImage *image,
         *width = gdk_pixbuf_get_width (pixbuf);
         break;
       }
-    case GTK_IMAGE_ICON_SET:
     case GTK_IMAGE_ICON_NAME:
     case GTK_IMAGE_GICON:
       {

diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index ef28c39cf22a55fbf9ce4d7f25f328d36eab5ee3..17318ff0cc1e8f21df22e93fa2b087fb1df115d9 100644 (file)
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -52,7 +52,6 @@ typedef struct _GtkImageClass         GtkImageClass;
  * GtkImageType:
  * @GTK_IMAGE_EMPTY: there is no image displayed by the widget
  * @GTK_IMAGE_PIXBUF: the widget contains a #GdkPixbuf
- * @GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
  * @GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
  * @GTK_IMAGE_ICON_NAME: the widget contains a named icon.
  *  This image type was added in GTK+ 2.6
@@ -73,7 +72,6 @@ typedef enum
 {
   GTK_IMAGE_EMPTY,
   GTK_IMAGE_PIXBUF,
-  GTK_IMAGE_ICON_SET,
   GTK_IMAGE_ANIMATION,
   GTK_IMAGE_ICON_NAME,
   GTK_IMAGE_GICON,

diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 243aabb710d789c6cbd8f09b4ef7f4a1f9a3aeee..95bac78d1611be4f75485b0389dcc0ed95a08ee3 100644 (file)
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
 typedef struct _GtkAdjustment          GtkAdjustment;
 typedef struct _GtkBuilder             GtkBuilder;
 typedef struct _GtkClipboard          GtkClipboard;
-typedef struct _GtkIconSet             GtkIconSet;
 typedef struct _GtkIconSource          GtkIconSource;
 typedef struct _GtkRequisition        GtkRequisition;
 typedef struct _GtkSelectionData       GtkSelectionData;

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index cf5b1f4125bb5482ac5a2bb3c274b36a33943ba2..60fc331f62b7dd0b319b9b9352fd798106e223bc 100644 (file)
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -35,16 +35,6 @@ void signal_second (GtkButton *button, GParamSpec *spec);
 void signal_extra (GtkButton *button, GParamSpec *spec);
 void signal_extra2 (GtkButton *button, GParamSpec *spec);
 
-/* Copied from gtkiconfactory.c; keep in sync! */
-struct _GtkIconSet
-{
-  guint ref_count;
-  GSList *sources;
-  GSList *cache;
-  guint cache_size;
-  guint cache_serial;
-};
-
 
 static GtkBuilder *
 builder_new_from_string (const gchar *buffer,